Align code with option names