Cleaned up BlockWire