removing string concatenations and logging