Removed disgusting whitespace.
Code clean-up and organization.