Cleaning up house a little bit