Switched to using str.format() for string concatenation