Little bit of performance optimisation