Fix coding standard issues