travis-ci, refactoring