Cleanup and Codestyle fixes