Refactored comment model logic
Cleaned up specs