Reorganize and clarify rules