Lots of slight cleanup