Revert "Modernise and refactor"

This reverts commit b627f858c6f6644fefd564b59767099160259f5a.
Revert "Revert order of initalisation in dictionaries"

This reverts commit fa39fcd1571c61bec059b845b091f2a31c23832c.