Refactor comments and answers form