Minor Refactor of const values