Code Cleanup

Performed some code cleanup.
Code Cleanup

Performed some code cleanup.