Did some tidying