some simplification using <<type>>

Change-Id: I7c8ded7bacfdc7c26beba27d0690d102741bab28