[REF] auto-fix conventions (with manual fix)