refactor runner complex decorator logic to be able to build up on