reworked data flow for user preferences from server to client side.

These modifications do not result in a change in functionality. This is merely cleanup.