Some code cleanup, update .travis.yml