Use account data constants in more places.