a bit of polishing and commenting