[REF] auto-fix conventions (and manual fixes)