Handling Webhook Data - Code Cleanup