Clean and optimise, mostly the broadcast