Moved options to new lines as requested.