Refactor

Refactor