re-orgnize code