tidying up Contractor controller