Fix spelling
Simplify code
Update eds and hibernate