Cleaned up Settings