Done refactoring Task
Basically the final refactor of refactor1