revisit code, cosmetic changes
use Travis CI