Code style changes as per review
String formatting used instead of concat