Major code cleanup.
Code cleanup.
Comment cleanup.