Refactor another time.