Made the various constants far more obvious