Documentation cleanup (golint, etc.)
Make the terminology match
100% test coverage