code cleanup again