More consistent use of constants