Fix CS
Fix namespace
Use correct Travis sections
Remove duplication