Reorganize to improve understanding