Cleaned up settings