Added voucher descriptions; Code cleanup