Code base improvement and Travis CI support