Changed the order of some options and added indentation