Spyder Copy and Paste fixed
General style cleanups
Added dummy for docstring support