readability cleanups, adding user service