changed: pythonic style