Refactor Settings

Just testing this