Clean up form; simplify options