Minor coding style cleanups