A smidge of cleanup