Adding topology choice to simulator
pep8 compliance