Remove some smells
Change travis config