Fixed remaining coding standard issues