Wire code cleanup!