Renamed collaborator and rearranged code