travis and refactoring