refactoring + fix version tag