Made options nicer