* Refactor Code