Added docstrings
API cleanup