pull 299 code review changes