Some code re-formatting