code cleanup, no other changes
code cleanup, no other changes