Changes to fix pep8 errors.

One pep8 error still remaining. This pep8 error is for the topology schema string.
More changes will be required to read this string from a file which will fix the
error.