ncm-cdispd code cleanup

Work in progress related to #8...

Discussion on cleanup goals is better placed in #8.
why stopping checking the other paths and saying all is fine? (maybe a `next` instead of `return 0` )?