Use better names + move the remove EOL spaces :au to a group