clean up imports, fix a docblock