Reorganize and clarify