[fixed] minor efficiency improvements

Change-Id: I288d61e3aa31dfb216d5b9461a2660de9a06f84b