Tidying up master