whitespace, doc string and explicit import fixes