Little bit of cleanup. Still got some nasty bits!