[m12522] ACE Code Style cleanup