More cleanup on guidelines with feedback from Webb