cleaned up the defaults