Refactor Constants to Reference