Small coding standards changes