minor refactoring + travis conf