Improved usage of constants