Cleanup

Plugin needs a refactor. 
- We're already using helper functions, so try to split more out. 
- Consider making a `lib/cdc_functions.sh` or similar to pull out verbose code into functions. 
- Add comments to new code missing them.