Some code-cleanup.