Refactored some '+' string concatenation to use format or join