Optimization - constants moved to separate object