Code clean up in various files.