Simplified some settings