Type and name should never have extra whitespace now