tidied up options syntax