some quick code cleanup