Cleaning up code for tomorrow's work.