[tor-dev] Chutney code refactoring