Little CleanUp

Change-Id: I569d7b08e225a9a7513e4ecd857d161965e281a1