Tidy up some comments and namespace issues, pushing becauase Travis didn't start a build yet.