Fixed coding standard issues