refactor for travis