Cleaned up the preferences a little.