Removed a lot cleanCode violations.