Refactored to clean up white space.
Merge conflicts removed.