Skip to content

More code cleanup

More code cleanup #302