ncm-cdispd code cleanup

Work in progress related to #8...

Discussion on cleanup goals is better placed in #8.
switch place with next `if` block, and you can assume the new_component is active