Cleaned up comments based on new Python 2 versus 3 structure