addressing code reviews