Styleguide: addressing code review comments