Little changes - clean up