Better use of constants