Gotta clean up a little bit