Codestyle cleanup

Cleanup some codestyle issues.