- Removed non-useful connivence functions
- Added comments