Review of current code base

Hi Paul, hope you like these updates.

Overall, the code looks accurate to me based on our previous discussions, many thanks for the effort you have put into the readability of our design, it certainly seems to convey the requirements to me at least :+1: