Improve abstruction
Fix mistakes
Improve translation