refactoring
update setup
travis config