Addressed review comments

Also cut down 1 and half page