More comments, more simplifications