Improve readability of mode options