reformat
use JPA