pylint cleanup added
fixing merges