Remove layer of confusion on units