#25: minor clean-up