better constants organization