Just a bit of cleanup