Preparation for 1.10 upgrade module should let a user map all unit and frequency text to concepts
Follow up to clean up the code
Applied auto format changes