Revert "minor comment fix #873"

This reverts commit 63525373768d340fa107eb3bcf910709e1d549c3.
Revert "clean up code comments #873"

This reverts commit f92329b02b69f5b8868b1c787653393371a0dba3.
Revert "hide comment settings except when enabled for type #873"

This reverts commit fa9fc8e7e336073c0b1f86401e8286a82fb9c8cf.