Refactor 1
Refactor 1