Improve comments and reorder factors a bit