code cleanup (again)