Change language for clarity
Refactor code and lines length
Bump version