ncm-cdispd code cleanup

Work in progress related to #8...

Discussion on cleanup goals is better placed in #8.
It's so easy to change after all what has been done! I'll be happy to implement any suggestion you have...