Abdullah - formatting changes