Refactor version checking; package version vars