reorganize and clarity