Cleaned up more code in connections view
More cleaning refactoring of connections view

Didn't seem to break anything