tidying up invocation setup