Use consistent string formatting

Used + operator sometimes, format in others, join in other.