~ refactored client dependencies