Cleaning up graphing imports
More graphing imports improvement