tidying up vars