Rearranged comments