Refactor Travis-build