Small clean-up #19