code cleanup

whoo hoo!!!!!