Clean Code. Trailing whitespaces and tabs removed.
Backwards compatibility for new menu items.