cleaning up code to get ready to turn in