NWC : Code cleanup