Refactor core settings form