Refactor python files slightly to use 4 spaces instead of 2
    And, few tweaks here and there to satisfy our friend pylint