Fixing pep8 recommendations
Fixing recommendations from pylint