MDF1 Project 4 Cleanup