Consolidating constants, made a small interface change for usability for references