Fixing typos from last refactor