More clean up with the indicators

Returned the normalized social_links code and various other clean up
points. You don't need to set 0 in any case due to the clearing at the
start of each indicator cycle.