Code Review enhancements