code cleanup and getting things ready to turn in