more refactoring incoming_controller, contracted if statement