Code cleanup, substitute constants for frequently used strings.