Code cleanup
* Simplify code
* Clarify var names
* Whitespace
Implement membership connection caps