Skip to content

Refactor and fixes

Refactor and fixes #13