Simplify comments, use core comment form and list