Some re-formatting of code.