create new EntityManager in Storage, small/codestyle fixes