Zendesk issue fix

Some code cleanup and a fix for the ZenDesk error that is thrown when a new ticket is created