sync
code clean up