Missing imports
Fixed for PEP
Cleaned up documentation