Performed some general cleanup.
More updates for Week4...
Updated with Week5's assignment.