Changed to OOP
Code refactoring  and commenting
(total time +40 min)