Refactoring (cleaned Area and AreaList)