Few changes

I have played with the module imports to allow for none pycharm
niceness.