azerty-mac support + cleanup