Code refactoring JPA-store.
Code refactoring for the JPA-store.