Changed constructor and added Law of Demeter to all methods.
Explanation to oop