small codestyle fixes and TODO added