improve use statements

Change-Id: If75f1c256832ccbda9c1b158edf8197d0cc93233