code review changes @ianstormtaylor