Cleanup and work on lab 2