Project 4 clean up