If it aien't broke, optimise it