cleaning up for pylint and general file structure