refactor helpers to build claims from user account