Refactored to OO
Refactored code so save LOC
Refactored code so save LOC