Clean-up - version using reactive analysis functions