Refactoring
Finishes refactoring