Skip to content

Simplifified code

Simplifified code #282