[TASK] Use proper string concatenation to reduce line lengths