Code

[PATCH] diff: further cleanup.