This PR polishes a bit by removing String literal concatenation where possible.