Refactor travis