Cleaned up imports (isn't using wildcards anymore) and docstrings