Eliminate arg order dependency
Reset method refactor and bug clear