and code cleanup again