Skip to content

Small refactor

Small refactor #1040