some code cleanup
record change in Changes