[issue #176] [WIP] solves some coding style faults