Refactor increment version scripts