some code clearup