Remember to tag values with units

While at it refactor for code reuse.