Skip to content

Overall cleanup

Overall cleanup #376