Implemented add/remove collaborations and cleaned up code