ncm-cdispd code cleanup

Work in progress related to #8...

Discussion on cleanup goals is better placed in #8.