refactor row applier for readability