Cleanup

some code cleanup