travis debugging + refactoring