Cleanup and optimisation, (3/3)
Moar