another code cleanup