merge formatting changes from Arun