Skip to content

Cleanup and update

Cleanup and update #30