Clean up based on feedback from zlin

- Sort options for nmh
- Remove commented out descriptions