Minor optimizations.
Code cleanup.
Code cleanup.