* fix: state reordering * refactor: remove unnecessary argument * refactor: mutation after setting default