Skip to content

Simplify code

Simplify code #368