just some clean up, no structural changes