Skip to content

Small refactors

Small refactors #1500