code clean up, debug message cleanup
code clean up