Refactoring, update JSDoc
Update version