More helpful code review changes