Formatting, removing duplicate changes, renaming