Tidying up variables