Remove superfluous REGEX and update comments