Updates via code review and remove all of the toStrings