storm.py: clean-ups