Update docs
Refactor to match PEP 8 style guide, small code cleanup and additions