Refactor 1

Refactoring