Refactor in OOP

Here it is! #7, in code! :smiley: