Pythonic style update