Move all options into table and comments with line reduction