Skip to content

Refactor and update

Refactor and update #2