Changing references, removing redundancies, and updating