Consolidating code of conduct

Combining two parts (long form and short form) into one.