initcpiocfg: cleanup and code fixes