Upgrade to present UM level

Including whitespace cleanup