Refactor Settings-classes