Skip to content

Simplified code

Simplified code #275