Architecture.
Add JPA. Clean data.