Clean and refactoring

Migrate to JpaRepository