Tidy up some.