misc clean up

optimize imports, update documentation