(feat) wire refactor and cleanup