Refactor 2

Refactor 2