Updates to the CoC, organizing it a bit