Global code clean up

Change-Id: I380d6afbc6b30d817ea6cca3d6b4634ab12522b1