minor cleanups for coding standards