Lots of Cleanup and Organization!