Comments now have a user field
Code refactor to eliminate duplication