Fix coding standards 2