Try to avoid cosmetic changes with "real" changes