Refactor comment loading.