diff --git a/hw/versatile_pci.c b/hw/versatile_pci.c
index e58b7f4..7048fb8 100644
--- a/hw/versatile_pci.c
+++ b/hw/versatile_pci.c
@@ -147,15 +147,8 @@
     pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_XILINX);
     /* Both boards have the same device ID.  Oh well.  */
     pci_config_set_device_id(d->config, PCI_DEVICE_ID_XILINX_XC2VP30);
-    /* TODO: no need to clear command */
-    pci_set_byte(d->config + PCI_COMMAND, 0x00);
-    pci_set_byte(d->config + PCI_COMMAND + 1, 0x00);
-    /* TODO: convert to set_word */
-    pci_set_byte(d->config + PCI_STATUS, PCI_STATUS_66MHZ);
-    pci_set_byte(d->config + PCI_STATUS + 1, PCI_STATUS_DEVSEL_MEDIUM >> 8);
-    /* TODO: no need to clear revision/prog ifc */
-    pci_set_byte(d->config + PCI_REVISION_ID, 0x00);
-    pci_set_byte(d->config + PCI_CLASS_PROG, 0x00);
+    pci_set_word(d->config + PCI_STATUS,
+		 PCI_STATUS_66MHZ | PCI_STATUS_DEVSEL_MEDIUM);
     pci_config_set_class(d->config, PCI_CLASS_PROCESSOR_CO);
     pci_set_byte(d->config + PCI_LATENCY_TIMER, 0x10);
     return 0;