Re-formatting code