Refactor code
...
Separated responsibilities