-Use bool instead of int.
-Move declarations and initial definitions together

Change-Id: I4874984b7f76b141cd3d1f8078b536c129dcc136