Improved code organisation.