Addressed review comments

 - universally across project