Code review issues addressed.