Code Cleanup

Performed some code cleanup.