Simplify/improve settings