Set 1 Python updated / refactored