refactioring Crowd