A0 Q4.1
Refactor constants