Work/ahmad/code optim

Some code optimisation/modernisation. Split into separate commits to ease reviewing (and not have Gitlab choke on one big change). I plan to squash some of the commits.