Skip to content

simplify code

simplify code #586