Codestyle cleanups