Cleaned up preferences so everything looks cleaner