Sound optimization.
Code cleanup.