Cleaned up some of the messy project.