Added Connection Information, Code Cleanup