Run drawing optimisation and refactoring.