Added first round of code review changes