Minor cleanup to indentation and removed string concat.