Whitespace changes, and function refactoring.