Fixing lint

Fixing all pylint violations in current develop branch