Post refactor - comment collection