Fix typos
Refactor ordinal suffix creation