minor design improvement