Code review comments addressed