Fixed per rubocop
incorporate best practices; law of demeter