Underscores added to quantities, and removed from functions