Fix coding standard violations