Avoid shadowing members (#4300)
More compact initialization, rm single use members (#4300)
Move c coupling to the correct class (#4300)
Merge pull request #4301 from dschwen/tensorclean_4300

Avoid shadowing members