Fixed remaining Coding Standards issues