Accepting code review comments ... simple stuff