Tided up some things