All is neat and tidy again