Fix comment
Reorder methods
Refactor version management
Fix sonar warnings