A wee bit of cleanup