some editorial cleanup