Check for potential to pythonify

[bparzella]

When this was created I used a lot of C#, which imho manifested itself in the code.

Update the code to remove such constructs if there are mode pythonic ways to do this.