Removed a couple of string concatenations