reordering and comments