Rubocop fix
Code using full_name delegate to avoid .entities.full_name
Client refactoring