Clean options code