Cleaning up the defaults a little