Netlist: Code clean-up