Simplified a string concatenation, removed TODO.