A first attemp of nicer comments