Fix coding standard issues

Same as above.