Skip to content

Small refactors

Small refactors #322