Completed intended refactor but something is awry