Cleaning up project 3