Reorganozed the content, for clarity and futureproofing