Cleaned up Defaults/Settings