code clean prepare to use Spring Data JPA