refactoring
refactoring
refactoring
refactoring
refactoring
refactoring
refactoring
Finished most of the refactoring