Refactor to Follow the Law of Demeter