code cleanup (?)