Skip to content

Cleaner logic

Cleaner logic #19