Refactored the version helper