Skip to content

Code clean-up

Code clean-up #426