Fix coding standards violations