Finishing changes for Programming Assignment #2