More cleanup, and organization.  I hope you don't mind!