Just a little bit of cleanup