Eliminated some dead stores, and also moved some
declarations & initial definitions together

Change-Id: Ic0bc1a1d1fc6fb6315bae8006584e4102ff51996