Better settings class, more object orientation