string concatenation style fixes