Bug merge : clean comments