Refactor

Simplify settings