Tidy up and fix travis problem