Removed comment_no and comment_count fields.

Removed comment_no and comment_count fields. Adjusted test.py and factories.py accordingly. 
I have also shortened some lines that were too long, added new lines where needed and deleted some spaces.