Another set of addressing code reviews