Code cleanup and travis-ci added