Reorganising code
Optimisation, bringing OOP performance closer to procedural performance