Clea up and travis-ci added