Streamlining logic from code review.