refactor some stuff
use travis container infra