General code cleanup to match PSR's.
More code cleanup.
More code formatting.
More code formatting.