Fixed pylint complaints
Fixed pylint complaints
Refactored
merge