Clean up for better readibility.  Still needs documentation.
More goodness.