improve declaration counter