Refactor: fixed settings module