some code styling cleanups