Coding style nitpicks and cleanup