Code re-formatting