Skip to content

Further cleanups

Further cleanups #99