Code Cleanup

Code Cleanup - eliminated redundant object declarations cleaned up
declarations