Refactored BitterClient a bit