Reorg and make more clear