Improve readability of the options list
(cherry picked from commit 225afb6cad9808af42408875baaa243d6d75d92d)