Further code of conduct tweaking