Stylistic tweaks

Combine duplicate schema update hooks

Change-Id: I0b77a6084b38e3bc61ba660e099ae3623dea9614