Renaming and tidying commit