Code review amendments