Fixed some reviewer suggestions