travis, refactoring