Some refactoring of the Chirper client made.