Cleaning up code, checking to rubric.