Neaten up w/ Clover's changes