Addressed and cleaned comments from day 3.