ncm-cdispd code cleanup

Work in progress related to #8...

Discussion on cleanup goals is better placed in #8.
We do what? In fact I didn't change anything in this function but I'm open to more cleanups!