Travis: refactor