code cleanup

more cleanup