Code cleanup and Housekeeping
Prep for UnitTest