Re-done some formatting which was removed by accident