Code cleanup
code cleanup