more refactoring for travis