Did some tidying up