Cleanup
Support for leaders, private variables