Move string literals and number values over to constants
Move string literals and number values over to constants