Code Cleanup Part 2 --- whitespaces ...