Tidying up previous commit