[options] Consistent formatting and general niceness