clean up. added some docstrings
refactored some class attribute, method names