Debug Info: code clean up.