code cleanup and travis-ci added