Addressed comments in day 4 and did some cleaning.
Addressed some comments in day 2.