Skip to content

Clean up of code

Clean up of code #307