Minor improvements by removing some more string concatenations.