Code cleanup for nm_simple.
Code cleanup for nm_simple.