cleanup

some code cleanup