Skip to content

Fix code smells

Fix code smells #1020