Simplify options and improve naming