[Issue #360] [WIP] fixes indentation