Code Cleanup: Ticket Plugin - 2