Did refactor
Refactor 2