Clean up some variables and if statements, show 0 responses instead of ndash