cleanup
cleaned imports, added some docs
Merge remote-tracking branch 'origin/master'