Ran preliminary pylint and formatters over files
Further style revisions