Refactoring...

Refactoring