Refactoring Travis CI