remove extra spaces, regex to constant, also ":" to constant here and elsewhere