Cleanup
Test multiple conditions w/extract()
Whitespace
Docs cleanup