code cleanup - formatting changes