Some documentation and clean-up
More clean-up and documentation
Clean-up and documentation.
Fix function name for called class, remove old var