Fixing coding standard issues