[Comment] Add comment edit + refactor