Dedicated EntityManager_

Style fixes