Simplify version management & bump version