Refactor Travis Client