Tidying up teh stuff