Cleaned up typebot, more helper code