refacto of the HP + small improvments
Merge pull request #85 from M6Web/feature-improve-hp

HP Refactoring + small improvements