Code review comments incorporated