Skip to content

Code cleanup

Code cleanup #877