Fix Law Of Demeter violation