ncm-cdispd code cleanup

Work in progress related to #8...

Discussion on cleanup goals is better placed in #8.
Yes, we could. I saw it yesterday reviewing once again this piece of code... Will try to do it.