Cleaning, small optimisation