code cleanup - formatting