Performed some code cleanup.