code cleanup
code cleanup for wh