some more twiddling cleanup