Refactored big client into small concerns