Slight tidying of Version module