Code Cleanup

Performed soeme code cleanup.