Fix and Format in NodeConnector