Pre-code review changes