Idiomatic formatting of Unit functions

No functional changes.