Reduced code smell issues. Mostly whitespace changes. No new behavior