code cleanup
Code cleanup