Code cleanup.
Cleanups/convention.