Refactor code
Refactor code