Code Cleanup

Minor code Cleanup.