refactoring into oop
Commenting out what is believed to be unneeded hook
refactoring