Lots of clean up of messy code from the generator