Code review updates