Preferences model cleanup

it's a start.