Pull 285 code review changes