Untangling the mane

See the Disqus comment :)

And make sure you configure profile pictures or avatars now for Users. I added some comments in your code and it'd be great if you took a look!