Refactoring after 1st 2 chapters of POODR