Addressed and cleaned comments from day 2.