#25 DRYed up version related code at maintainer request