Refactor

START
Refactor process
Refactor