Minor coding standards cleanup