Update.
Code cleanup.