Clean up grammar
Add in conformance