Minor cleanup of constants