Skip to content

Lots more cleanup

Lots more cleanup #97