MEditor Code cleaning