Simplify comments, use core comment form and list

related - #1111