Fixing Coding Standards transgressions.