Just cleaning up a little