Refactor.
More refactoring.
Cleaning up.
Cleanup.
Better spacing.