Cleanup Assignment 1