Clean and fix
Modes modes