34 Re-formatting code