code cleanup
fix cleanup bug
Merge branch 'code-cleanup'