[issue #169] [WIP] fixes some coding style
[issue #169] [WIP] fixes some coding style faults