Some optimization

Change-Id: Ieee8629ac8a51657963056d8692938287fce769a