ncm-cdispd code cleanup

Work in progress related to #8...

Discussion on cleanup goals is better placed in #8.
I suggest stopping here with the improvements! If you think this is worth a modification, I'd suggest opening a new issue that we could process after 14.8...