source code clean up