refactored the collecting with Website objects