resolveUnitPrefixes, normalizeUnits -- refactoring