Code review comments resolved