Made changes to remove the constant from being returned from getHiveName and getVersionNumber.  The other suggested changes need to be discussed - but may be able to be made (moving lines 94-111 into reload).