small refactor
refactored logic and set proper app version