[issue #170] [WIP] fixes some code styling faults