Made little code optimisation