WIP: Refactor constants (comments welcome)