Cleaned up preferences a bit