optimize more

Change-Id: Ica1bdcf6ca72fdc03a10d3e097dcf8fe3a9d21e9