cleanup - formatting