References #232
Fixes #232
A bit less indentations