Small refactoring, using vars inside a string instead of concatenation