Minor refactoring for version numbering