Updated and removed imports on legacy install,

fixed some PEP8 line length issues