Final cleanup

Final commit prior to homework submission