Even more cleaning, and commenting