Use a constant to store unitless ufuncs
Remove redundant returns