code clean up in more files.