Removed core.incubator dependency
Some improvements to the docstrings