zeus:small clean-up