Cleaned up Settings class interface