ncm-cdispd code cleanup

Work in progress related to #8...

Discussion on cleanup goals is better placed in #8.
One of the few original lines left! Credit to original author! I'll remove it.