Refactor code if required

[ethindp]

The code may need to be refactored. Though I've done my best to follow best practices and coding patterns, I may not have succeeded (e.g. I may have overused iterators).

The difficulty of this task isn't known - I'm not really sure what needs to be refactored, if any, and what may and may not need to be refactored will change over time as the project develops.