Just cleaning up a little bit