Performance optimisation
Code cleanup