Code review comments addressed.