Simplify access to the EntityStore

[kerbymart]

Accessing the EntityStore should be made simpler by eliminating the redundant getInstance method call:

EntityStore entityStore 
    = isClientMode ? DataFactoryClient.getInstance().getEntityStore() 
          : DataFactory.getInstance().getEntityStore();

It should be straightforward and easy to understand, like something that requires little effort to comprehend:

EntityStore entityStore 
    = isClientMode ? DataFactoryClient.getEntityStore() 
          : DataFactory.getEntityStore();