More changes - clean the code.