Remove outdated comment, fix spacing
Fix Python 2 unicode collection name issue