Just a wee bit of cleanup