Skip to content

Refactor logic

Refactor logic #839