Refactor code
Refactor code (again)