minor changes - clean up