Code cleanup
code merge