- code clean up
- build script update