small code cleanup..