Small refactoring preparing version number patterns