Address more of code review