Minor clean up of units