DRY optimisation and layout changes.