Recent comments optimalisations