codestyle + cleanups