Cleaning up some of the weirdness