Refactored original pigeon organizer to make it more concise