Code cleanup.
.