comment + cleaning