[FIX] Travis: Refactor