Minor clean-up in review