More prettyness, and optimisation.