Refactor the existing code in dev branch.
Refactor the existing code in dev branch.