initial settings refactor commit