Some cleanup and adding values for wire (thread passed)