Fix for string and int concat
Fixed indentation (tabs->spaces) and removed trailing whitespace