major cleanup to live indicator code