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