Cleanup and codestyle fixes. 1st step.