Refactor
Refactor code