Finished code cleanup.