factor props out of calls