Skip to content

simplified code

simplified code #451