Updated comments pre-squash