Skip to content

Further tidy up

Further tidy up #961