Cleaning up the version parsing