giraffe/client refactoring (cont.)