Standardize on mkString(char)
Code updates from Nick's review