Refactor constants in CLI