Make it even more beautiful.

Change-Id: Icd12f6f6c767d32e9a8dd2582864e6228c27ae29