cosmetic code cleanup