code cleanup (2)