Fixed cosmetics, and changed to return correct constant...